I had the thought that with our compositional pipelines, "funk name" and "class name" should just be equivalent to "name funk" and "name class", respectively, as the latter would just expand to function and then get its name. This would simplify implementation, and lead to more consistency.

I implemented the migration, and 10 tests fail.

On the bright side, most of the failures reveal inconsistencies in the way we handle "funk" vs "name" vs "funk name", ie "funk name" sees something as a function but "funk" misses it, and should be fixed, or "name" is missing something that "funk name" hits, and should be fixed

Unfortunately, there are a couple of test cases that are more problematic. The biggest problem is the C++ test

In this case "class name" selects ClassName before the ::, but of course "name class" breaks because we're not in a class. Not sure what to do about this one

Checklist

• Remove functionName and className from

  cursorless/packages/common/src/types/command/PartialTargetDescriptor.types.ts

  Lines 75 to 133 in 65fab51

  	export type SimpleScopeTypeType =
  	| "argumentOrParameter"
  	| "anonymousFunction"
  	| "attribute"
  	| "branch"
  	| "class"
  	| "className"
  	| "collectionItem"
  	| "collectionKey"
  	| "comment"
  	| "functionCall"
  	| "functionCallee"
  	| "functionName"
  	| "ifStatement"
  	| "instance"
  	| "list"
  	| "map"
  	| "name"
  	| "namedFunction"
  	| "regularExpression"
  	| "statement"
  	| "string"
  	| "type"
  	| "value"
  	| "condition"
  	| "section"
  	| "sectionLevelOne"
  	| "sectionLevelTwo"
  	| "sectionLevelThree"
  	| "sectionLevelFour"
  	| "sectionLevelFive"
  	| "sectionLevelSix"
  	| "selector"
  	| "switchStatementSubject"
  	| "unit"
  	| "xmlBothTags"
  	| "xmlElement"
  	| "xmlEndTag"
  	| "xmlStartTag"
  	// Latex scope types
  	| "part"
  	| "chapter"
  	| "subSection"
  	| "subSubSection"
  	| "namedParagraph"
  	| "subParagraph"
  	| "environment"
  	// Text based scopes
  	| "token"
  	| "line"
  	| "notebookCell"
  	| "paragraph"
  	| "document"
  	| "character"
  	| "word"
  	| "identifier"
  	| "nonWhitespaceSequence"
  	| "boundedNonWhitespaceSequence"
  	| "url";

• Figure out how to handle TODO comment, and remaining more complex modifiers that contain other modifiers
• See if users are actually using the CPP example
• Talon-side, remove scopes from default csv, but allow it to be present if it's already there
• I have added tests
• I have updated the docs and cheatsheet
• I have not broken the cheatsheet